Structure changes, code style