Back to astw and cleaning up code