1. Toast Fixed
2. Code clean-up

Signed-off-by: Alex Volkoff <suxlv2@gmail.com>