checkstyle issues fixed
using card sugar
removed redundancies and obsolete code