Qual: Clean code. Removed useless functions and params