Moved Initializers and Methods into the same file