FINAL Commit V2

fixed some indentation