Jc 2032 code review refactoring

http://jira.jtalks.org/browse/JC-2032
Please, remove the back ticks (`), they are not necessary in most cases.