Released rounded tags, minor code cleanup