Minor cleaning
SD testing