make everything more readable, remove unused