Commented some code
Cleaned some other
Added a main container