Cleaned up the code a bit
merged reamde