Cleaned up signature