Cleanups

Related to #425