Improved comments
Small code improvements