Made code more neater

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