Jc 2032 code review refactoring

http://jira.jtalks.org/browse/JC-2032
Again - FK :)