cleaned out code