Refactoring (added form parameter constants)