Cleanup of "my version" of the code

blank slate=good :)