cleaned up lil bit