Beautifying

- more KISS and DRY