Refactor cleanup

@memespring have a look then please