Update Code Readability and Style