Clean up  + made things better.
Cleaning up.