Small changes: looks nicer, cleaner code.