improve Coding Style