Minor fixes & style improvements