cleaned up various functions in Board