Cleanup init() method a little bit.