Just cleaned up, renamed a function