Removed unnecessary complexity