Cleaning code and added info