Code style clean up