Configuration rework
CheckStyle!