removed comments, prettified code