Minor clean up and int size optimization