Cleaned up KeyBuilder