Merge "removed code smells by replacing annotation"