wrap_up

Till Hauerrequested to merge
swt-project_wrap-up into swt-project-filtering

changed some code for better readability and better performance code cleaning

Merge request reports