Code cleaning and some temp files removed