code style + cleanup