Lower-case variable names
Comment cleanup