slight restructuring of code, better variable parsing, removed unneeded functions
slight restructuring of code, better variable parsing, removed unneeded functions

TheChymera/LabbookDB,TheChymera/LabbookDB