Fixed other bugs in code style