Checkstyle errors and redundant code now removed