Cleaned a bit formatting and comments