Clean and Comment Code

[willwoodward]

Prepare the code. Make sure to:

• Add error handling
• Check component tree structure makes sense