add codestyle, simplified stuff a bit