Just some minor cleanup [0]