[Junkfood] Made a code clean-up, reformatting. Modified signatures to more obvious ones.