Procedure grammar and some cleaning

Signed-off-by: Lysander <lysandergc@gmail.com>