some basic cleanup that bugged me