Fixed Coding Style Problems