more code cleaning up