Code blocking

Moved some code blocks around because my OCD made me… :-/