some improvements (removing unused/unnecessary bits)