Removed unused headers
Updated types and return values for better standardization