Add whitespace rules (close #4), fix another empty-lines issue