cleaned up formatting, changed key definition method