Resolve codeclimate warnings; Fix typos