Fix Sonar findings

Remove all cycle dependencies
Indent code
Make classes final