Got rid of ugly wrapping and sorted members