Fixed minor bug and cleaned app.yaml