add form a bit cleaner