removes useless if statement
improves style on docs
improves output messages