Revision of code; Logger removed along with non-essential functions