went through and cleaned stuff up