Cleanup bits of code

 * Change lint to allow one-line if's
 * Fix typo
 * Reduce loglevel