Just some cleanup work