Code cleanup and made ready easily requirable