improved, not great

cleaned up, could be better