Update comments and cleanup