Formatted properly
Updated comments