Cleaned up the code a bit. More is coming.