master cleanup

messed up on the last commit