Improvements, codestyle and exclude filters added