Capitalized class name
Updated comments