cleaned up the messy