Fix squid movement, adhere codebase to style

Test the squid changes locally, they look like they make a lot more sense, refer to my comment in the code.