File size validation and some builder cleanup

Some cleanup. Lets see if github works!