addressed comments from silkysun

@silkysun I've re-opened a cleaner PR. Hope it doesn't complicate things rather than help