Refactor code a bit more after feedback, add missing changes into specs