Cleanup and adding #56