Some more cleanup & usability improvement