minor theme & organization changes