Code cleanup and changing views architectures to composition