Coding Style and some reorganization