Maintenance

alter comments and code structuring