Comments extended for better inline documentation