Unnecessary comments deleted, code formatted