improves on interface and ndentation fixes