Made object functions explicitly public
Tidied config delimiters for files
Moved some defines about