Updated gitignore file
Reviewed code style and updated some naming
Reviewed code style and updated some naming