Using tabs now (hattip: @MajorMadness), some minor optimizations

Signed-off-by: thisischris <c@ia.net>