Fixing indentation and code style