* Added CustomForm
* Cleaned up code