Minor fixes & code cleanup