moved several items to different classes / general cleanup