cleaned up a lil