Cleaned up comment functionality a little