simplified a few things

Signed-off-by: bytechomper <bytechomper@gmail.com>