Cleanup + small fix to size