Some code clean up

Just to make my morning more exciting ;)