Refactoring classes - PMD

Signed-off-by: vrlc92 <vrlc92@gmail.com>