Stop tracking unnecessary elements
Restructure application for better readability