cleaned up app.'s