Clean up initialization and get rid of XIB