Update 20140731

Removed the line and make the code more readable(