Fix apostrophe in bills and cleanup