Cleaned up some code in the Equipment Service