neatening up
append to prev commit: neater