even more cleaned up