Some refactor and aesthetic improvements to hand up