Fixing issues (formatting, variable names, etc.) from review comments