Modifications to Coding Style