Code revision

Removed redundant forms.
Implemented constructor overloading.