Removed trailing whitespaces
Little refactoring and state is know knowledge