Cleanup
Move variables out
Always use line numbers