code cleanup: #21

little by little getting cleaned up. wish i had more time.