some refactoring, commenting, cleanups, so we can start on connecting our stuffs