cleaned up previous submit and source code