cleaning up code from PMD