some code formatting, correct idents