Made a null pointer fix
Ceaned Class
Done adding more comments
Removed classes again