Code Maid cleanup
Reorganized classes
Adding comments