Added forms and tweaks whitespace.