Fixing aesthetics and original issues with pull request