Examples and cleaner code