cleaned up notes and simplified all