Small changes on presentation