Cleanup and style improvements