Code cleanup, updates to post form