cleaned up some parts