[TaskyPortable] tidy solution