Updated comments and formatting
Updated version