+Refactoring PSR2

Signed-off-by: Ramón Ramos <arathael@gmail.com>