Cleanup some messy parts