Followed PMD recommendations