Following conventions, fixing stuff