Made initialization a bit more modular