Function declaration fixing, presentation stuff