Cleaned up the code a bit; changed README