cleaned up console logs and code structure