Added some style, and code tunning performed