Refactor/Final touches