adding line number, changing code style