Further Code Clean Up + Initial Sonar Setup