merge itzamma/personal pc
refactoring