Formatting
Removed doc blocks
Reverted TypeMismatchException