Sizeof cleanup

Next round :)