Added Property/Variable/Argument definitions
Fixed some missed imports
Removed unnecesary doc blocks