Cleaned part of the code, renamed from DTO to bean