Small cleanup and start generalizing variables