Jc 2032 code review refactoring

http://jira.jtalks.org/browse/JC-2032
The method name is not clear.. Either add JavaDocs, or try picking a better name.