Fix: some issues & code style