cleanup gem file and asset model a bit