added some fields, changed code-style