Fixed some code and doc smells