Cleaned up pointer types