Moved all initialization within the constructor block