cleaned up base a little bit