Cleaned up Code
Added Sonar Class