Cleanup Code style