Applyed @fabpot suggestions