Cleanup and better resolution

Not sure, though I commited this.