Clean Commit - All working

Signed-off-by: Jonathan Dekhtiar <marco.flint31@gmail.com>