readability update

base form file, make a bit more readable

this is a problem throughout the entire codebase.  I will make this nicer...