Fixing Coding-Style Issues