Deleted default value and cleaned the code a little bit