Code style and clean up