Technical debt

This issue is for listing possible problems regarding technical debt present in the code and offer improvements.