Cleanup code style for public