Code formatting, remove trait usage