No changes to functionality, just cleaning up code.