Assertion implementation; code cleanup
Removing lint