Updated Whitespace
Added data cleanup functions, not working yet