Removed recurring code