Right curly braces and statements' curly braces fix

Put else in same line with last curly braces

Deprecated elements should have both the annotation and the Javadoc tag