Slightly improving overall code quality

Hope I didn't miss anything. :)