Moved some code to initialize() function