Bugfix and Codeconvention

Fixed the bug, that the features are always added again, when using the
spatial filter.
Also doing some codevonvention correction