cleaned up mapapp a little