Issue #452 Removing redundant variables and fighting with checkstyle