Clean up of code and using # for marking bingo