CheckStyle RunThrough

Started Cleanign code for CheckStyle
temp data