Few refactoring on classes