Started cleaning code