Beautified Code.

No bugs as of now.