thrid commit

this is just overall code cleanup