Initial clean up script
Added functions
Added TODO