Reworked several components to improve quality and efficiency of code.