cleanup method
cleanup method
move block down
cleanup method
remove old march stuff
rename
move related methods close to one another