Some comments and cleanup