Seperated the form to getForm method
Fixed some doc blocks