cleaned up
removed comments