Clean up code related to offsets and size calculation