Removed white space and redundant calls.