General house cleaning: moved & deleted

Deleted extraneous code: Horizontal, Vertical, Diagonal
Moved a few variables