Cleanup dbcodon to use methods