movement fix and code reformating