Simpletops refactor