Cleaned Coding Style