Further cleanup of code, better descriptions