d140: more code beutification by Xotic