Simplification of codebase & commenting all methods