code cleanup, observing vazarra's swag work