Comments and general cleanup