Core/Handler: More white space cleanup