further commenting + some formatting