cleaned up, added/removed comments