Make code for my personal formmating, make it clear on Eclipse, few
updates, remove metrics