Fixing Coding Style