Move check deeper, code style