Removed CompiledComponent
Cleaned code a little