Clean Up and addition of About