general updates in code style