Additional class and cleaner code.