clean code (merge windows/android)