Removed comments, fixed formatting