Improved Coding Style