Code reduction and improving documentation.