Variable naming and error checking complete