Removed long comprehentions, reformat code - removed tabs and white spaces
Fixed #5 and also resolved #5