Update: Rename && Review Closures