final commit. cleaned up the code