simple cleanup changes