Converted tabs to spaces (4 spcs)/tab.
Removed a few unnecessary `lib prefixes in a couple of commands