Merge pull request #7 from lynnaloo/trialbal

Removed redundant code, cleaned up components