Cleaning up the interface and comments