Removed the if statements from the constructors to improve performance