Minore code style changes & cleanup