code style cleaned