Cleaned dubs, new added and made it pretty (better readable)