Cleaned code, renamed component, improved task