Cleaned up GenHam a bit