fixing and cleaning up