Simplified conditions, removed redundant spaces