Better naming, cleaner code