Further code cleanup, removed sbytes and replaced with bytes