Added generic types. Removed C block comments, apostrophe strings & duplicate line comments