Style and form cleanup