Files separated, cleaner code