Adding trim method, removing todo