Removed as statements, and changed a few readability things...

Signed-off-by: Decius <deciusreln97@gmail.com>