Cleanup

Minor repo fixes & a performance improvement