Added comments, code clean-up
tabs converted to space