Some code cleanign