Change code inside the constructor. More work on style