Informal Revision

Glanced and modified some code (most likely will not run at first try
since it hasn't been tested)