cleans up the code base a bit