cleaned up the source