Cleaned up + Convert-Functions