small improvements, cleaner now