cleaned up a bit :3