bug891914 - started removing whitespaces
bug891914 - cleaned up