Fixed null space
Formatted for class coding standard