fixes for code style etc.
Base content form