Removed long function wrapping