Cleaned up boss code