Fixed code smells
Updated felix version to version 4.2.1