Removed cleaned up code and renamespaced.