Cleaner code, more output methods