Started cleaning code base