cleaned up for a bit