Started cleaning code/profiling (moved filters to separate classes, removed unnecessary comments, etc.,).