cleaned up master for review