Clean up code format to improve readability