Slight cluter cleanup