finished cleaning up library declarations, console logs and other misc cleanup