removing extra line
fixed naming conventions