Cleaning and better naming

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