Cleaned up the code
Merge branch 'TestBranch' of https://github.com/omkar-ramtekkar/paintapp into TestBranch